From 4c84a790dec3dc416630a810eca904448b522308 Mon Sep 17 00:00:00 2001
From: Hollis Blanchard <hollisb@us.ibm.com>
Date: Tue, 3 Oct 2006 18:23:21 -0500
Subject: [PATCH] [POWERPC][XEN] Move gmfn_to_mfn() from page.h to mm.h to
 avoid recursive header dependencies. Signed-off-by: Hollis Blanchard
 <hollisb@us.ibm.com>

---
 xen/include/asm-powerpc/mm.h   | 23 +++++++++++++++++++++++
 xen/include/asm-powerpc/page.h |  1 -
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/xen/include/asm-powerpc/mm.h b/xen/include/asm-powerpc/mm.h
index 8c3d228d67..89306a3c95 100644
--- a/xen/include/asm-powerpc/mm.h
+++ b/xen/include/asm-powerpc/mm.h
@@ -28,6 +28,7 @@
 #include <asm/system.h>
 #include <asm/flushtlb.h>
 #include <asm/uaccess.h>
+#include <asm/debugger.h>
 
 #define memguard_guard_range(_p,_l)    ((void)0)
 #define memguard_unguard_range(_p,_l)    ((void)0)
@@ -274,4 +275,26 @@ extern void free_extents(struct domain *d);
 extern int steal_page(struct domain *d, struct page_info *page,
                         unsigned int memflags);
 
+static inline unsigned long gmfn_to_mfn(struct domain *d, unsigned long gmfn)
+{
+    int mtype;
+    ulong mfn;
+    
+    mfn = pfn2mfn(d, gmfn, &mtype);
+    if (mfn != INVALID_MFN) {
+        switch (mtype) {
+        case PFN_TYPE_RMA:
+        case PFN_TYPE_LOGICAL:
+            break;
+        default:
+            WARN();
+            mfn = INVALID_MFN;
+            break;
+        }
+    }
+    return mfn;
+}
+
+#define mfn_to_gmfn(_d, mfn) (mfn)
+
 #endif
diff --git a/xen/include/asm-powerpc/page.h b/xen/include/asm-powerpc/page.h
index 9175f62046..61a757fb79 100644
--- a/xen/include/asm-powerpc/page.h
+++ b/xen/include/asm-powerpc/page.h
@@ -30,7 +30,6 @@
 
 #include <xen/config.h>
 #include <asm/cache.h>
-#include <asm/debugger.h>
 
 #define PFN_DOWN(x)   ((x) >> PAGE_SHIFT)
 #define PFN_UP(x)     (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
-- 
2.30.2